merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 9 Dec 2011 05:23:18 +0000 (14:23 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 9 Dec 2011 05:23:18 +0000 (14:23 +0900)
commitdf7483e2cb7a93974db7e15c3048d0d835cf2f07
treef8a5f8461864119dd27ddacd841e004221e61de9
parente03875ac1ce02a6d1ffd1cf92fc81f51688123b6
parentc2ecdb49ce8f62f4b78396abe640695441a36d53
merge trunk